Merge branch 'Tablet-View-Changes'
Fixed bugs
Merge pull request #3 from tesstryan/Updates-to-Fix-Bugs

Updates to fix bugs