Better ui (38/48)

Better ui