Better ui (7/48)

Better ui