Tidying up layout.