Updated pill controls rollout branch with main view more