Fix for height
Merge branch 'rr-imagefixes'

Conflicts:
	public/styles/styles.css