Add search bar
Markup navbar controller
Global cleanup and reformatting