Small fixes.
Menu fixes.
Fixed conflicts from issue 6 commit.