Actual menu code, refactoring, new graphics