Hello Saima,
Frankly, we have agreed on leaving the roles as they are, since it is not causing any problems. Additionally it doesn't really make big difference in WebUI.
However, please try the method mentioned above by Bhargav and let us know, if it was any good 
Thanks and Good Luck,
Mark