Starting to refactor code. The menu buttons can be built.