Cleaned up views. added ability to jump around states.