Added Nav-bar for navigation within app; restructured controllers with new service