Fix test function
Put button at top
Tweak graph