[CHANGE] ElementFragment layout, first code inspection, minor changes