Changes to edit functions, updates before upload to prototype site