Re-design forms
Fixed db structure and some files