Fixed some bugs caused by the merges, adding proper reset buttons and a
close button for the full screen up