Fixed sidebar not showing. Minor locale fix
Merge remote-tracking branch 'upstream/develop' into develop