Changes onCreateView
The buttons will now be updated correctly
Merge remote-tracking branch 'origin/master'