Implemented Links page
Resolved conflicts