Fixing things for Laurie - to work on layouts