Finish links, simplify tests
Add controller and base views