Adjust position of button based on orientation
Merge remote-tracking branch 'origin/master'