fix padding on smaller devices, close #20
make the food icon related to food
merge changes in master
fix grammar, punctuation, etc
fix merge conflict and nitpicky text edits
merge with upstream