few changes regarding the buttons availability.
Merge remote-tracking branch 'origin/CristiN'