Main style

These are just style changes, should not affect anything else. I did, admittedly, skip 2 tests that were blowing up on me - something with capybara not finding the elements/content. I will work on that tomorrow, but they were mostly content concerned, and I feel confident can be fixed, but just don't want styles to diverge too long from master.