fix agenda, minor fix , clean code, fix TabLister