fixed more merge errors
 - fixed some merge bugs
 - disabled day view
 - disabled desktop/mobile-specific options