Simplify code.
part of #68.
Fix item addition to container,
Create a custom class for displaying input.
part of #83.