small cosmetic adjustments
Merge branch 'develop' of https://github.com/nbracers/nbr into develop

Conflicts:
	public/css/styles.css