switched like button location
Merge branch 'staging'