More changes to the overall style