tidied up layouts