New design with buttons