Swap internal label and question columns

Also sneak in a change btn-default color rider.