Tidy up UI
Merge branch 'stories' of github.com:guardian/frontend-admin into stories

Conflicts:
	app/views/events.scala.html