Re-add border on current calendar, fix ui issue
Remove empty element (not needeed, and html validator does not like it)