Better ui (41/48)

Better ui