Some updates I found, better structure of navigation