18848 - Added css changes and fixed falsy issue with zero values