templates updated, navigation bar added