Tried to fix PuzzleActivity but got tired :P