Updated Forms to be pretty