Rearranges GUI and added checkbox so user can select no date