Cosy Puzzle Cabin: Hotfix #3

Some minor bug fixes and a re-implementation of the Jigsaw selector