Updated all inputs to look nicer

Fixes #25