UI changes and Notification added