updates, clean-up and brining simple ui into sync with copy in jsfs