Some refactor; added Google Analytics script