Cleaning up a bunch of code so it's more consistent.
Disabling landscape mode for now.