Added form and style changes