add: better button management + edit mode