added menu and score containers
merged master branch with refactoring