BRANCH 4.2-105: made calendar appear better on TableLayout