Better ui (44/48)

Better ui