Completing FMPRO-74

Conflicts:
	css/main.css