Updated spacing and classes