Fix layout theme. Almost done staffAccount
Merge remote-tracking branch 'origin/master'