Starting to rearrange the layout to have a unified interface