Revert ae1e7f9..ee6780a

This rolls back to commit ae1e7f9bd82fa97c6209bde6a437933d71bbc14b.
Attempt to debug layout issue
Revert cca942c..fbacff7

This rolls back to commit cca942c25d2dd156fee8a5d571a65fdfd5e08d53.
Adding Camera Control
Cleaning Up