starting on reworking layout