I have corrected the selectors and improved the nesting. Updated MR for same....