Miscellaneous UI fixes / bug fixes

Conflicts:
	system/cms/modules/navigation/js/navigation.js