Tidying up layout helpers