Style updates and fixes