More grunt features, tweaked styling