Many styling improvements