Changes done for Selected+Focus on button as per review comments given