tidying up info and layouts