Added nav bar, changed layout