Make radius optional with a menu setting

Did some other refactoring with the notifications