my account changes, calendar modal and some func changes