Address review comments + fix/expand Chrome extension template