Fully modified the navigation bar #19