moved form around a bit
Merge branch 'master' of github.com:fadeit/fadeitdk