Made squarer and less cramped.