minor changes and margin tweaks
Merge

Conflicts:
	views/index.erb