Modify add property page to be user friendly and change ui element code
Merged master and isaaDev, fixed conflicts