Fixed up includes to draw correct navigation.