Button work
More config property cleanup