Updated form field labels with associated ids for accessibility
Refactored header layout for search on the top