move buttons to top, fixes issue #825