Matching Paula's GUI since apparently I merged wrong