Fuelux touchup

I'll squash these commits then merge after review