Remove addPropertyCtrl and fix scope variables to show each step properl...

...y