Button drop down fixes