fixed calendar problem
small changes to views