Use 4.0 navigation area

#25