Better ui (22/48)

Better ui