Fixing layout issues with container items