nav bar stuff and a bit of the header
merged files