Updated with buttons I designed