Merge "Makes All Set layout more responsive." into sc-v2-dev