Corrected buttons and drop down lists changes