fixed some naming problems and fixed menu bug
Merge branch 'master' of github.com:koralarts/bare