Improved navigation and added static data (change it in the future).