Miscellaneous UI fixes / bug fixes

Conflicts:
	system/cms/modules/navigation/js/navigation.js
Merge branch 'refs/heads/2.3/develop' into 3.0/develop