Improve view form