Some styling changes for 2.x