UI tweaks and push notification handling