Added fish and lake list templates, fixed data passing between pages