[Fixes #81026188][#80473180] fixes css + correction code review