Revert "Minor miscellaneous changes for NOOBS v1.3.8"

This reverts commit 47fccbd02ea6af6a486cdf9fcfb95d90daee0a26.
Revert "Revert "Minor miscellaneous changes for NOOBS v1.3.8""

This reverts commit 8bc53c36d0870825cc20ddb5ad1621efd8b6b35e.
Revert 47fccbd..8bc5c2b

This rolls back to commit 47fccbd02ea6af6a486cdf9fcfb95d90daee0a26.