I'd replace that safety and that front sight with original ones. Does anyone know which manufacturer made that scope base/mount? I can't remember seeing one like this. A real pity someone modified the bolt handle.