Fixes #260 calendar layout
refs #260 merged development branch into integration