GUI-348: Update styles to better match latest mockups