Merge Rover-83,84 changes

Fixed resource black out issue and UI bugs. (ROVER-83 and ROVER-84)