Added dropdown links
fixed merge conflict