More styling and structural improvements