tidying up layout