Calendar incorporated and UI changes