More style fixes and cleaning up.
Merge branch 'master' of https://github.com/simoneriksson100/Telus-E2E-Bundle

Conflicts:
	packages/base/resources/js/display.js