Merge pull request #34 from GJST-Capstone/stacy

Stacy
removing a few commented out stuff
fixing merge confilit
Merge pull request #35 from GJST-Capstone/gregory

Gregory
adding viewport
Merge pull request #36 from GJST-Capstone/gregory

adding viewport
add more select options for focus areas