So it's going to be more work than I thought (not a surprise). Going to merge this in and we can dedicate a full story to styling next sprint.