form styling and markup changes