Fix more issues on feature unlocked screen
Undo dubious code that causes crashes