fixed styling issues & refactored xaml