Increase default width of text inputs.
Resolve merge conflicts.