UI and javascript edits