Re #136 Fix button location