NXP-15249: Fix display issue and clean css