reworked layouts into sections