nav working for the moment.. refactoring!