Updated lots of stuff, working on design tune-up in Sketch.