Panic style updates

Task #3294