ToDo edit

More Javascript Changes