Adjust width better