Fix search bar layout
Cleanup
Re-structure