working on navigation

progress