Moved navbar styling in. Tweaking filter area.
Resolved merge conflicts.
Fixed filter area.