Merge pull request #3 from mss1982/master

Complete functionality data base
Add missing buttons, separate forms logic