Made Notifications Button work + Minor code cleanup and fixes