Better ui (47/48)

Better ui