UI fixes for crashing feature