Add background and logout button.
Merge remote-tracking branch 'origin/develop' into develop