To extend classes with .btn;
Adjust picker size
refactor