re-applied stashed button changes