fixed several buttons only appear when logged in with according user
Merge remote-tracking branch 'origin/master'