Moved notification handling to Main Activity