Moved dropdown down and refactored markup