ModelView matrix improvements