Merge proprio viewlets into one viewlet
Add cancel button