MOB-548: Styling fixes