CE-2031: cleanup styles

How to review this:

• verify visually all is well in the actual app
• also verify things look consistent in the stories (with the way things were implemented before, the stories were not styled the same way)

Unfortunately is going to just be lots of small changes peppered throughout

Closes CE-2031