Slightly better layout