Moved some stuff around
Custom form fields