Re-synced with spark.html
Merge pull request #370 from ussuri/catch-up-to-main-ui-2

Re-synced with spark.html