Add controls
Fix atom init value