Feature/manage buttons