Working on navigation (#154). Resolved #155.