add google button and refactor code a little bit