Updates

Restructered xaml code
Fixed textbox