Adjusted Buttons and Minor UI Changes