layout optimization

looks better?