Rename layout files; handle different text for puzzle and solution