Added edit buttons
Visual improvements
More visual improvements
Merge branch 'master' into site-integration