Style and bundling changes