@nasthagiri, thanks for pinging me here. I've already changed this in the PR I messaged you about earlier today - https://github.com/edx/edx-platform/pull/3080

For the sake of efficiency, let's let the UI dust settle before that is critiqued. @cahrens, if that is fine by you, we can address visual and content/control aspects once that work is merged into this branch (as the PR above is hoping to do).