Fixing few minor bugs - possible causes of freezing. Recurring problems with localStorage - maybe caused by hanging server.
Merge branch 'feature/43547829-save-EB-options-failure' into develop