Fix navigation issue + code refactoring