am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev

* commit 'ff44ed58a1e38ff830e74b0d73549ff01725852d':
  Disabled states, more UX work, bug fixes.