Better ui (8/48)

Better ui