Makes the switch ( using model/view instead of modelview ) on few more places. (still some to do)