Fixed syntax error in conditional
Increase viewPort to desktop size
Merge branch 'master' into production