Better done-for-now layout