added basic navigation bar
refactored views to remove redundant logic