Finished implementation of better navigation. Fixed, cleaned and re-factored code. Fixed bugs.