#662 - fix content action
#669 -resource edit layout + design