Clean up
Add flex container
Add full container