Fixes and changes the way picker inputs work
Merge branch 'fix/input-pickers' into develop

* fix/input-pickers:
  Fixes and changes the way picker inputs work