reworked layout