Fix links, add links to dropdown