#12 and #13: Calendar layout fix
Merge branch 'frontend_implementation' into Development