Menu building logic fixes
Ready to be pulled
Merge pull request #34 from KISS-Web-Design/gh-pages

Fixes the menu logic