Fixed UI elements that were not cleanly laid out