Starting refactoring to styles
Xaml ok now