updated navigation and much more