cleaned up layouts