cleaned up button positions