Feature/design fix

Design fixes aren't complete, but improved enough that it'll help Beth if she were to look at the dev site.