Merge and final polishing
Merge pull request #523 from alterm4nn/NewUIFormFix

UI improvements: header forms