Fixing orientation change bug nicely

Fixes #1