NXP-15226: Add missing mainNoTabs class and update layout