Fix commit

Fixed 3D view and some minor other fixes