Add some classes, update WHQButton