Better ui (45/48)

Better ui