Moved some stuff around to fit on the form better