Clean up JavaScript and add Today event