Fixed spacing, merged the styles into one