enhanced layout slightly