Re-design forms
Fixed db structure and some files
Merge pull request #4 from eye-of-dev/work

Work