fix up button origins and get tests passing