UI cleanup :sunglasses: