Fix min width, add the rest of the values

Fix min width, add the rest of the values #2363