[KFSQA-839] More style fixes.
[KFSQA-839] Fixed some issues raised during review. Swapped in #pick! for #fit for selects.
[KFSQA-839] More improvements to style.