[ADD] Button and clean up