Styling fixes to prevent extension conflicts
HotS improvements