Many styling fixes