Cleanup orientation issue