update styles and couple of tests