Resolved mobile to desktop transition glitch. Minor code cleanup.
Merge pull request #1184 from pjackson28/master

Fixed mobile to desktop view transition glitch