Style updates and script tweaks