fix gui skin issue, code cleanup
Prepare for 1.4.1 release.