NXP-15896: Fix pre display, add default classes for the UI