Adding some basic controls into the RiftMode.
Merging in the changes and fixing the RiftMode. Trying to ifdef out RiftMode.h caused compilation errors so it was removed.