Feature/ui component table widgets merged spec fixes