Rework the layout completely