hotfix for update loop
introduce add buttons, other feature additions
updates to add client facing features
fix merge conflict mainjs
fix merge conflicts in assets