Minor UI improvements for SONAR-4346
SONAR-4501 Moved Category & SubCategory to internal package