Update 4.0

Navigation and page 2 complete