Styled all forms
Fixed merge conflicts