Buttons and drop down lists changes for consistency