Navigation: Adapted layout and extracted configurations.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ngUSD-client/app/views/main.html