pulled in style improvements form demo_1 cleanup