slightly better layout