Reworked layout