Cleaned up JavaScript mess
Improvements to Calendar functionality, design