grunt passes, styling fixes