Updates to make form a little prettier