got rid of buttons where needed, fixed minor link bugs
Merge branch 'master' of https://github.com/rbirdman/Dropbox