Simplified sign out button
An active text colour experiment
Merge branch 'layout' into develop