Nav bar+ Footer + Links
resolved merge
merged