Refactor layout to make creating similar layouts easier