Merge "More UX work for thumbnails, search, management." into klp-dev