Nav Bar half done
Most FE done
Merges complete