Additional styles and structural changes