Styling improvements
Resolve conflict