Layout added, links created, tests refactored: