Added nav bar and further utilized templates