Fix typo with Google Chrome and reorganize things