made changes to index and popup ja