Added some more databinding and adjusted the layout a bit.