Made the forms a bit saner