BRANCH 4.3: alignment fixes to discussion and calendar widget