fixed container issues