Fixed right panel mentor issue