HWMonitor minor UI fixes, refactoring
HWMonitor minor UI fixes, refactoring