Fix containers & their styles

Change-Id: Ibdd44ccb9586de169671a11b1df47fd14862387f