Changed window and control size
Refactored primitives editor code behind