Issue #634 - Refactor settings page to be more robust and add new setting for progress bar