Better width management for all layouts