moved misplaced button
Merge branch 'update'