NXP-15496: Fix styles on previous next, misc fix