Camera updates

Fixed to meet Jason's layout
Merge pull request #12 from onidavin/master

Camera updates