Prettifying the forms
Fixed merge conflict
Prettified forms! YAY
Merge conflict