Styling changes based on feedback.
#MBL-10594
#MBL-10603
#MBL-10602