Navigation Module Layout

fixes #2254
close #2254

Signed-off-by: Joshua Pekera <joshuapekera@me.com>