Several changes on models, responsive & calendar