Ajay/Melanie | #3106 | Added styling