Update views
Update watermark
Fix form wrapper
Fix field width