Fix issue #316
Fixes issue #315 (and the sight module icon bug)
Fixes issue #313
Fixes issue #311