First start at restyle
More style tweaking