Redid hard coded links
fixed merge conflicts