Updated DataBinding
updated Controls
updated Layout