Better ui (24/48)

Better ui