Lock the width down lower and make it a bit more flexible