Fixed styling and attribute assignments