Changes in the styles to avoid problems with white spaces