Fixed bug with drop down items in toolbar
Minor changes