Tightened layout slightly