added includes and fixed nav to prepare for single page structure