remove this and update strings in secret
Merge branch 'qa'
Merge branch 'qa'
fix spelling
update bw, adjust roam and arrange toolbar