Set ability to disable/enable view
Merge remote-tracking branch 'origin/master'