New design and bug fixes