Merge pull request #6 from joshjeong/guest-waiting-connect-display-fix

completed fix for guest display screen
Merge pull request #7 from joshjeong/stylistic_madness

Stylistic madness