Calendar fix
Alarm View Controller fix
Optimizations