Changes to design regarding navigator and some comments :D