Cleanup the UI as much as possible (Rough), first cleanup
Cleanup the UI as much as possible (Rough), first cleanup