YH-402: Fixed calendar navigation position
YH-439: Using view instead block in calendar listing