Ajay | #3360 | Added more styling