Tweaks and fixes enabled notification

I should have done a separate branch but got carried away mainly UI tweaks and added a few fields