Various changes

Finished JS tweaks for adding/removing