Some ui changes with the buttons and other minor tweaks