Reworked layout.