Cleanup notification widget code, move action to top