Improve button positions