* make list js work
* merged changes