Added some comments
Split navigation