reworking layout