Fix styling and grunt