Merge pull request #42 from luixxiul/ui

prevent pages from flashing
Merge branch 'master' into ui
missing quotation mark added, unnecessary lines deleted