Fix input disable bug
Merge branch 'fredley'
Fix sidebar issues
Merge branch 'master' into fredley