Added buttons to control which days of the week are active; also did some refactoring