More refactoring, renaming of classes, tweaking of level 6s difficuly and setting the back button behavior