Changed the styles according to SAB feedback