rework the layout again.