Refined styling
WIP fixing when/Where
More style refinements