Fix spacing and styling