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