Cleanup of 'Lists of available classes': all versions of a button on one line to save space