Added more form styling and icons