refactoring some parts and adding navigation ability