styled some things earlier this week
merging conflicts yay
emily's changes?
fooled around with making it prettier and merging emily's and my changes