Alert/Notice messages Cleanups
 - change dashboard links
 - change alert/notice message