New design
minor fixes