Refactor code, add buttons to change quarter