Improve generic component markup