add css tweaks to handle hotfix overflow. #5830