Some mistakes corrected, navigation bar moved to separate file