Fixed the width issues