reorganised layout