Fix some issues
Add Google Analytics