Fixing property and view rendering; TODO watches