+ fixed calendar and user page