Tidied up the project, fixed button status for non-six-button mode.