finished fixing main navigation problems

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #94 from jonezy/master

finished fixing main navigation problems