Revert f31d814..c81290b

This rolls back to commit f31d8148befe40f14173686fe2f32c22ce12c286.
Orientation Stuff

Dug even deeper into this modal orientation MADNESS and I think I
finally have a solution. Going to clean up the code and take a well
deserved break.