Browser popup code clean.
Frontend code clean up.