fix: Issue #3343868: Fix styling issues
fix: Resolve #3343868 "Initial implementation"
feat: Issue #3343868: Initial implementation