content editing propagated

- markup refactored
- garbage classes removed