Add in ui-calendar and fix collapsible navbar