version fix
small refactoring and shapeview update