reworkedLayout