Reworked content width and collapse behavior