[Steve/Alberto] Refactor drop down menu filling and dependents