Good progress on the UI js code