Improved wording, move Mocha section to better place

Also expanded goo.gl links so the user sees where they will end up before clicking