add layerset markup for design, edit element popup bugfix