- updated to include new view modes