Better ui (35/48)

Better ui