Changed UI, Notfiacation added