Better ui (18/48)

Better ui