More changes
Finally fixed styling?