Further rearranging and resizing.