Crisis page fixes part 1
Merge remote-tracking branch 'origin/master'