Merge branch 'master' into front-end
Some new wording on modals
Adds percentage width on arrows
Merge branch 'front-end'