fixed overlapping confirm / save button refs item:405
changed close button size to a bigger font-size, fixed missing date selection if not completed  refs item:407
Merge branch 'develop' into refactor/fix
Merge pull request #243 from musamusa/refactor/fix

Refactor/fix
Merge pull request #244 from jofomah/feature/facility-question

Feature/facility question
Merge branch 'upstream-develop' into feature/facility-survey