Fix issues 1 and 2 re: button