Better ui (40/48)

Better ui