Cleaned up layouts