reworked layout to get it right