Fixed notification problem, removed widget and few bug fixes