Better ui (36/48)

Better ui