Helper classes for UI fixes