Improve button positioning