Added configuration buttons and removed testing code.