Added support for view cycling