UI cleanup and a crashfix for duplicate back key events