Many styling and template adjustments