Build #2344:   cleanup+fix button layouts+more cov on branch category-abstraction almost 6 years ago