Bug fixes when logged out
Merge remote-tracking branch 'origin/master'