Better ui (20/48)

Better ui