Added controller for navbar, further cleaned graph