Refactored Draw properties
Refactored View methods