Updating Icaro's "Main Activity" and "Calendar Manager" classes