route fix for toolkit
Merge remote-tracking branch 'upstream/master'
merging and deleting
toolkit views
live changes yay!