AI-499 : fixed style issues - use own subclassed widgets