Added handler for rotation views

- Added handler
- Cleaned up a little