issue#177 - moddify header
issue#178 - modify login window
Merge pull request #179 from kevin000/issue#177

issue#177 - moddify header
Merge pull request #184 from kevin000/issue#178

Issue#178
Pulled from main master 141005