Improve content container handling
Add screenshot