UI: Cleaning up buttons on screen