Added more UI changes to Upload forms
Merged UI changes with new db syntax.