#12 and #13: Calendar layout fix