Fixed layout issues for smaller widths