Puzzle and Interface Improvements