Various style changes and adjustments