OCD on camera controls alignment
Commit merges