- Replace Organization keys with drop down menus