fix bugs: current week missing, order of days