Fixing weighted UF. Added new template for question 1 and 2