refactor ElkContainer