Fixed binding, added list datasource and much more)