Fixed #18 (again): Switched order of buttons