properties add
properties update
Bugfix on layout management