Several styling fixes