Eliminate repitition (solves exercise 3.1) and Add Contact page (solves exercise 3.2)