Fixes for drop down buttons