Added support for the forms, modified style