Added navhelper and more split up includes