Improve topic alert's preferences

Previously watching/unwatching and alert/notify preferences were separate, unify them and make them a better UX. Fixes #1320 
typo