Raw form UI complete
Merge conflicts resolved