Changed edit button colour
Merge branch 'fixing-design-flaws'
merge commit