Fix some markup and styling
Cleanup preview components