Removing hardcoding on input widths

Fixes #497