added menu.
improved readability in AppContext and controllers.