Better ui (34/48)

Better ui