Cleaning up the UI and making the menus work.