changed url of plus button
fixed merge conflicts