double enforcing gui changes
Merge pull request #306 from ebbyw/Ebby

double enforcing gui changes