Pull request for: Crisis page changes