Add styling to the forms and refactor them