Added text inputs
Fix merge conflicts
Fixing mixins