Dropdown Menu & Cleaned up semantics