Added the navigation and fixed some small issues.