HB001.1

Layout changes