Fixed links and added views