Enhance GUI stability Pullrequest