Fixed UI flash problem
Merge pull request #26 from windyarts/master

Fix UI flash issue