Better ui (9/48)

Better ui