Matching the design a bit more