Stylistic changes to better comfort to design guidelines