Refactor container layout