Moved button into form