clean up routes; fix new organization form; adjust navigation to be based on current user