Tweaks to edit functionality, css and javascript