Better ui (42/48)

Better ui