Bugfixes and Improvements

Databinding