Menu system + improved logic
Merge pull request #1 from Lummee/menus

Menu system + improved logic