Refactor navigation script & design.