Add refresh feature
Clean up disable/enable code