Use container helper instead of hard coded container

What does this MR do?

Add container_class helper class to fix layout bug

What are the relevant issue numbers?

#18333 (closed)

Screenshots (if relevant)

Fixed:
Fluid: